improvement: Rework IndexedContext to reuse the previously calculated scopes #22898
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
I wonder if this strategy helps #22430 (which I haven't returned to yet) Edit: I guess only in the sense of "moral support". |
|
I think I am actually doing it all wrong and might be possible that IndexedContext is not really needed 😅 |
tgodzik
force-pushed
the
fix-slow
branch
2 times, most recently
from
3e69d9e to
21aa3b8
Compare
tgodzik
force-pushed
the
fix-slow
branch
4 times, most recently
from
d27ca2c to
376f628
Compare
tgodzik
changed the title
… scopes It turns out the work being done in IndexedContext was already done in Completions, but better, since it doesn't try to read files as the separate logic does. There is still some improvement to be done to not calculate it twice, but in order to keep this PR as simple as possible I will skip that for now.
tgodzik
commented
Apr 17, 2025
| @@ -48,6 +48,16 @@ case class Completion(label: String, description: String, symbols: List[Symbol]) | |||
|
|
|||
| object Completion: | |||
|
|
|||
| def scopeContext(pos: SourcePosition)(using Context): CompletionResult = | |||
There was a problem hiding this comment.
Ideally this would get deduplicated with normal rawCompletions being invoked, but I will try to do it as a separate step afterwards.
| @Test def `sealed-conflict` = | ||
| check( | ||
| """ | ||
| |object A { | ||
| | val e: Either[Int, String] = ??? | ||
| | type Left = String |
There was a problem hiding this comment.
type val actually fine here, but val causes an error
| @@ -655,7 +655,7 @@ class InlayHintsSuite extends BaseInlayHintsSuite { | |||
| | val y/*: S<<scala/collection/Set#>>[Char<<scala/Char#>>]*/ = f | |||
| | ??? | |||
| | } | |||
| | val x/*: AB<<scala/collection/AbstractMap#>>[Int<<scala/Int#>>, String<<scala/Predef.String#>>]*/ = test(Set/*[Int<<scala/Int#>>]*/(1), Set/*[Char<<scala/Char#>>]*/('a')) | |||
| | val x/*: AB<<scala/collection/AbstractMap#>>[Int<<scala/Int#>>, String<<java/lang/String#>>]*/ = test(Set/*[Int<<scala/Int#>>]*/(1), Set/*[Char<<scala/Char#>>]*/('a')) | |||
There was a problem hiding this comment.
This was inconsistent previously
kasiaMarek
reviewed
Apr 22, 2025
Comment on lines
+100
to
+107
| val fromPredef = defn.ScalaPredefModuleClass.membersNamed(name) | ||
| val fromScala = defn.ScalaPackageClass.membersNamed(name) | ||
| val fromJava = defn.JavaLangPackageClass.membersNamed(name) | ||
| val predefList = if fromPredef.exists then List(fromPredef.first.symbol) else Nil | ||
| val scalaList = if fromScala.exists then List(fromScala.first.symbol) else Nil | ||
| val javaList = if fromJava.exists then List(fromJava.first.symbol) else Nil | ||
| val combined = predefList ++ scalaList ++ javaList | ||
| if combined.nonEmpty then Some(combined) else None |
There was a problem hiding this comment.
Suggested change
| val fromPredef = defn.ScalaPredefModuleClass.membersNamed(name) | |
| val fromScala = defn.ScalaPackageClass.membersNamed(name) | |
| val fromJava = defn.JavaLangPackageClass.membersNamed(name) | |
| val predefList = if fromPredef.exists then List(fromPredef.first.symbol) else Nil | |
| val scalaList = if fromScala.exists then List(fromScala.first.symbol) else Nil | |
| val javaList = if fromJava.exists then List(fromJava.first.symbol) else Nil | |
| val combined = predefList ++ scalaList ++ javaList | |
| if combined.nonEmpty then Some(combined) else None | |
| List(defn.ScalaPredefModuleClass, defn.ScalaPackageClass, defn.JavaLangPackageClass) | |
| .map(_.membersNamed(name)) | |
| .collect { case denot if denot.exists => denot.first.symbol } | |
| .toList match | |
| case Nil => None | |
| case list => Some(list) |
Comment on lines
+90
to
+91
| def hasImportedByDefault = denots.exists(denot => Interactive.isImportedByDefault(denot.symbol)) | ||
| def hasConflictingValue = denots.exists(denot => !Interactive.isImportedByDefault(denot.symbol)) |
There was a problem hiding this comment.
Maybe make sense to use partition here? If you can do this on nonRoot instead of denots you could return the created collection.
| case Some(symbols) if symbols.nonEmpty && symbols.forall(_.isStale) => Result.Missing | ||
| case Some(symbols) if symbols.exists(rename(_).isEmpty) => Result.Conflict | ||
| case Some(symbols) if symbols.exists(rename(_).isEmpty) && rename(sym).isEmpty => Result.Conflict |
There was a problem hiding this comment.
Isn't here some sort of corner case?
package a
class Foo
package b
class Foo
package c
class Foo
package d
import a.{Foo => Bar}
import b.Foo
val x = new Foo // I want to import c.Foo
// for `b.Foo` rename will be empty, so I won't fall into this case| @@ -138,44 +141,40 @@ object NamedArgCompletions: | |||
| def fallbackFindMatchingMethods() = | |||
| def maybeNameAndIndexedContext( | |||
| method: Tree | |||
| ): Option[(Name, IndexedContext)] = | |||
| ): List[Symbol] = | |||
There was a problem hiding this comment.
Can you rename this function after changes?
| if !id.symbol.is(Synthetic) && !id.symbol.is(Implicit) => | ||
| symbols + tree.symbol | ||
| case sel: Select => | ||
| indexedContext.lookupSym(sel.symbol) match |
There was a problem hiding this comment.
I'm questioning this right now. Shouldn't we actually just collect the symbol of the qualifier? (Sort of a side comment not connected to the PR)
| @tailrec | ||
| final def toplevelClashes(sym: Symbol): Boolean = | ||
| final def toplevelClashes(sym: Symbol, inImportScope: Boolean): Boolean = |
There was a problem hiding this comment.
I don't really get this inImportScope param. Why did you add a symbols.exists(_.owner.is(Package) check? Wouldn't something like pkg.pk2.Object.name also conflict with package name?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
It turns out the work being done in IndexedContext was already done in Completions, but better, since it doesn't try to read files as the separate logic does.
There is still some improvement to be done to not calculate it twice, but in order to keep this PR as simple as possible I will skip that for now.